Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Fri, 11 Jan 2019 15:47:53 +0000 (10:47 -0500)
committerTom Rini <[email protected]>
Fri, 11 Jan 2019 15:47:53 +0000 (10:47 -0500)

Trivial merge